Skip to content

freebsdPackages.libcxx: switch back to libcxxrt on FreeBSD#316249

Merged
Ericson2314 merged 1 commit intoNixOS:stagingfrom
rhelmot:freebsd-minimal3/libcxx-libcxxrt
Jun 1, 2024
Merged

freebsdPackages.libcxx: switch back to libcxxrt on FreeBSD#316249
Ericson2314 merged 1 commit intoNixOS:stagingfrom
rhelmot:freebsd-minimal3/libcxx-libcxxrt

Conversation

@rhelmot
Copy link
Contributor

@rhelmot rhelmot commented May 31, 2024 •
edited
Loading

Description of changes

The sad followup to #315286

This targets staging because #311777 hasn't made it to master yet

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
    • x86_64-freebsd
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@rhelmot
freebsdPackages.libcxx: switch back to libcxxrt on FreeBSD
3a6141a 
also enable new delete definitions under libxxrt
@rhelmot rhelmot mentioned this pull request May 31, 2024
Merged
14 tasks
@rhelmot rhelmot added the 6.topic: bsd Running or building packages on BSD label May 31, 2024
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels May 31, 2024
@rrbutani rrbutani added the 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related label Jun 1, 2024
@Ericson2314 Ericson2314 merged commit 15ad778 into NixOS:staging Jun 1, 2024
@Ericson2314 Ericson2314 deleted the freebsd-minimal3/libcxx-libcxxrt branch June 1, 2024 16:22
@paparodeo
Copy link
Contributor

paparodeo commented Jun 12, 2024

using freebsd.libcxxrt seems to result in infinite recursion when building using pkgCross tho libcxxrt is ok.

nix-build -A pkgsCross.x86_64-freebsd.hello --show-trace 
error:
       … while calling the 'derivationStrict' builtin
         at <nix/derivation-internal.nix>:9:12:
            8|
            9|   strict = derivationStrict drvAttrs;
             |            ^
           10|

       … while evaluating derivation 'hello-x86_64-unknown-freebsd-2.12.1'
         whose name attribute is located at /home/anna/src/nixpkgs.0/pkgs/stdenv/generic/make-derivation.nix:331:7

       … while evaluating attribute 'stdenv' of derivation 'hello-x86_64-unknown-freebsd-2.12.1'
         at /home/anna/src/nixpkgs.0/pkgs/stdenv/generic/make-derivation.nix:360:15:
          359|       args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)];
          360|       inherit stdenv;
             |               ^
          361|

       … while calling the 'getAttr' builtin
         at <nix/derivation-internal.nix>:19:19:
           18|       value = commonAttrs // {
           19|         outPath = builtins.getAttr outputName strict;
             |                   ^
           20|         drvPath = strict.drvPath;

       … while calling the 'derivationStrict' builtin
         at <nix/derivation-internal.nix>:9:12:
            8|
            9|   strict = derivationStrict drvAttrs;
             |            ^
           10|

       … while evaluating derivation 'stdenv-linux'
         whose name attribute is located at /home/anna/src/nixpkgs.0/pkgs/stdenv/generic/default.nix:93:15

       … while evaluating attribute 'defaultNativeBuildInputs' of derivation 'stdenv-linux'
         at /home/anna/src/nixpkgs.0/pkgs/stdenv/generic/default.nix:127:9:
          126|       inherit initialPath shell
          127|         defaultNativeBuildInputs defaultBuildInputs;
             |         ^
          128|     }

       … while calling the 'getAttr' builtin
         at <nix/derivation-internal.nix>:19:19:
           18|       value = commonAttrs // {
           19|         outPath = builtins.getAttr outputName strict;
             |                   ^
           20|         drvPath = strict.drvPath;

       … while calling the 'derivationStrict' builtin
         at <nix/derivation-internal.nix>:9:12:
            8|
            9|   strict = derivationStrict drvAttrs;
             |            ^
           10|

       … while evaluating derivation 'x86_64-unknown-freebsd-clang-wrapper-17.0.6'
         whose name attribute is located at /home/anna/src/nixpkgs.0/pkgs/stdenv/generic/make-derivation.nix:331:7

       … while evaluating attribute 'depsTargetTargetPropagated' of derivation 'x86_64-unknown-freebsd-clang-wrapper-17.0.6'
         at /home/anna/src/nixpkgs.0/pkgs/stdenv/generic/make-derivation.nix:386:7:
          385|       propagatedBuildInputs       = elemAt (elemAt propagatedDependencies 1) 1;
          386|       depsTargetTargetPropagated  = elemAt (elemAt propagatedDependencies 2) 0;
             |       ^
          387|

       … while calling the 'getAttr' builtin
         at <nix/derivation-internal.nix>:19:19:
           18|       value = commonAttrs // {
           19|         outPath = builtins.getAttr outputName strict;
             |                   ^
           20|         drvPath = strict.drvPath;

       … while calling the 'derivationStrict' builtin
         at <nix/derivation-internal.nix>:9:12:
            8|
            9|   strict = derivationStrict drvAttrs;
             |            ^
           10|

       … while evaluating derivation 'libcxx-x86_64-unknown-freebsd-17.0.6'
         whose name attribute is located at /home/anna/src/nixpkgs.0/pkgs/stdenv/generic/make-derivation.nix:331:7

       … while evaluating attribute 'buildInputs' of derivation 'libcxx-x86_64-unknown-freebsd-17.0.6'
         at /home/anna/src/nixpkgs.0/pkgs/stdenv/generic/make-derivation.nix:378:7:
          377|       depsHostHost                = elemAt (elemAt dependencies 1) 0;
          378|       buildInputs                 = elemAt (elemAt dependencies 1) 1;
             |       ^
          379|       depsTargetTarget            = elemAt (elemAt dependencies 2) 0;

       … while calling the 'getAttr' builtin
         at <nix/derivation-internal.nix>:19:19:
           18|       value = commonAttrs // {
           19|         outPath = builtins.getAttr outputName strict;
             |                   ^
           20|         drvPath = strict.drvPath;

       … while calling the 'derivationStrict' builtin
         at <nix/derivation-internal.nix>:9:12:
            8|
            9|   strict = derivationStrict drvAttrs;
             |            ^
           10|

       … while evaluating derivation 'libcxxrt-x86_64-unknown-freebsd-14.0.0'
         whose name attribute is located at /home/anna/src/nixpkgs.0/pkgs/stdenv/generic/make-derivation.nix:331:7

       … while evaluating attribute 'stdenv' of derivation 'libcxxrt-x86_64-unknown-freebsd-14.0.0'
         at /home/anna/src/nixpkgs.0/pkgs/stdenv/generic/make-derivation.nix:360:15:
          359|       args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)];
          360|       inherit stdenv;
             |               ^
          361|

       error: infinite recursion encountered

@rhelmot
Copy link
Contributor Author

rhelmot commented Jun 12, 2024

This is fixed by https://github.com/NixOS/nixpkgs/pull/315176/files#diff-a1d82dc079c0b7eadf81b86652b44c344cccb5a4e23c60e8390904f06f93a2fcR11

@rhelmot rhelmot mentioned this pull request Nov 11, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

6.topic: bsd Running or building packages on BSD 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@rhelmot @paparodeo @Ericson2314 @rrbutani